home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Aminet 5
/
Aminet 5 - March 1995.iso
/
Aminet
/
text
/
misc
/
pcal_4_5.lha
/
pcal
/
Kultur
/
pcal45_sasc651.patch
< prev
next >
Wrap
Text File
|
1994-11-10
|
3KB
|
143 lines
--- pcal:pcalinit.c Sun Oct 16 23:19:22 1994
+++ pcalinit.c Tue Oct 18 22:05:32 1994
@@ -35,6 +35,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
#include <string.h>
--- pcal:readfile.c Sun Oct 16 23:19:20 1994
+++ readfile.c Tue Oct 18 21:57:14 1994
@@ -161,7 +161,7 @@
int line = 0;
int pptype, extra, ntokens, save_year, expr;
- int (*pfcn)();
+ int (*pfcn)(char *);
char *ptok;
char **pword;
char msg[STRSIZ], incpath[STRSIZ];
@@ -1321,7 +1321,7 @@
char **pword; /* pointer to word after ordinal */
#endif
{
- int wkd, mon, mm, dd, len, (*pfcn)(), doit;
+ int wkd, mon, mm, dd, len, (*pfcn)(int, int, int), doit;
int val_first, val_last, val_incr, mon_first, mon_last;
DATE *pdate, date;
@@ -1424,7 +1424,7 @@
char ***pptext; /* return pointer to first word of text */
#endif
{
- int prep, n, rtn, base_wkd, incr, (*pfcn)();
+ int prep, n, rtn, base_wkd, incr, (*pfcn)(int, int, int);
DATE *pd;
/* we have the weekday - now look for the preposition */
@@ -1543,7 +1543,10 @@
if ((cp = *++pword) == NULL)
return PARSE_INVLINE;
- ADD_DATE(n, atoi(cp), curr_year);
+ {
+ int m = atoi(cp);
+ ADD_DATE(n, m, curr_year);
+ }
TERM_DATES;
break;
--- pcal:writefil.c Sun Oct 16 23:19:52 1994
+++ writefil.c Tue Oct 18 22:09:32 1994
@@ -233,7 +233,7 @@
#endif
{
int i, nfonts, nfsize, copies, dfltsize, color_dates;
- char *p, **ap, tmp[STRSIZ], alt_color, *allfonts[MAXFONT];
+ char *p, **ap, tmp[STRSIZ], *allfonts[MAXFONT];
struct tm *p_tm;
time_t t;
#ifdef UN_X
@@ -1124,7 +1124,7 @@
year_info *py;
month_info *pm;
unsigned long holidays;
- int i, j, len;
+ int j, len;
short color[32];
len = LENGTH_OF(month, year);
@@ -1208,7 +1208,6 @@
register day_info *pd;
unsigned long holidays;
int has_holiday_text;
- static int first = TRUE;
static int save_year = 0;
/* if no text for this year and month, return */
@@ -1351,7 +1350,7 @@
int month, year;
#endif
{
- static int nmonths = 0, page = 0;
+ static int nmonths = 0;
int startbox;
/* start of new physical page? */
--- pcal:exprpars.c Sun Oct 16 23:19:38 1994
+++ exprpars.c Tue Oct 18 21:34:10 1994
@@ -171,7 +171,7 @@
OPERAND *ptop;
#endif
{
- return ptop[0] && ptop[-1];
+ return (OPERAND) (ptop[0] && ptop[-1]);
}
@@ -183,7 +183,7 @@
OPERAND *ptop;
#endif
{
- return ptop[0] || ptop[-1];
+ return (OPERAND) (ptop[0] || ptop[-1]);
}
@@ -195,7 +195,8 @@
OPERAND *ptop;
#endif
{
- return (ptop[0] ^ ptop[-1]) != 0;
+/* return (ptop[0] ^ ptop[-1]) != 0;*/
+ return (OPERAND) (ptop[0] ^ ptop[-1]);
}
@@ -207,7 +208,7 @@
OPERAND *ptop;
#endif
{
- return ! ptop[0];
+ return (OPERAND) ! ptop[0];
}
--- pcal:moonphas.c Sun Oct 16 23:19:32 1994
+++ moonphas.c Tue Oct 18 21:44:30 1994
@@ -67,6 +67,12 @@
#include <ctype.h>
#include <math.h>
+#ifdef __SASC_60
+#ifdef abs
+#undef abs
+#endif
+#endif
+
/*
* Pcal-specific definitions:
*/